From f90254ea2e5f0c96085a080db814abf05c417f9c Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 22 Oct 2010 15:14:51 +0100 Subject: [PATCH] libxc: convert evtchn interfaces over to hypercall buffers Signed-off-by: Ian Campbell Signed-off-by: Ian Jackson --- tools/libxc/xc_evtchn.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/libxc/xc_evtchn.c b/tools/libxc/xc_evtchn.c index da35e2ac7f..528b59305b 100644 --- a/tools/libxc/xc_evtchn.c +++ b/tools/libxc/xc_evtchn.c @@ -22,32 +22,31 @@ #include "xc_private.h" - static int do_evtchn_op(xc_interface *xch, int cmd, void *arg, size_t arg_size, int silently_fail) { int ret = -1; DECLARE_HYPERCALL; + DECLARE_HYPERCALL_BOUNCE(arg, arg_size, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - hypercall.op = __HYPERVISOR_event_channel_op; - hypercall.arg[0] = cmd; - hypercall.arg[1] = (unsigned long)arg; - - if ( lock_pages(xch, arg, arg_size) != 0 ) + if ( xc_hypercall_bounce_pre(xch, arg) ) { - PERROR("do_evtchn_op: arg lock failed"); + PERROR("do_evtchn_op: bouncing arg failed"); goto out; } + hypercall.op = __HYPERVISOR_event_channel_op; + hypercall.arg[0] = cmd; + hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(arg); + if ((ret = do_xen_hypercall(xch, &hypercall)) < 0 && !silently_fail) ERROR("do_evtchn_op: HYPERVISOR_event_channel_op failed: %d", ret); - unlock_pages(xch, arg, arg_size); + xc_hypercall_bounce_post(xch, arg); out: return ret; } - evtchn_port_or_error_t xc_evtchn_alloc_unbound(xc_interface *xch, uint32_t dom, -- 2.30.2